Yet more ChangeLog merge fixes
authorGlenn Morris <rgm@gnu.org>
Wed, 9 May 2012 03:30:51 +0000 (20:30 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 9 May 2012 03:30:51 +0000 (20:30 -0700)
commitf60f03af34acfd8d623b76c09b50c4f539f1ec08
treed02a22de8a6ff9570261c01038e32ea1a05dbeb0
parentde0eefe5881570b726524e18b80641a507a668f9
Yet more ChangeLog merge fixes
doc/emacs/ChangeLog
doc/lispref/ChangeLog
lisp/ChangeLog